ESQL: Fix block randomization on circuit breaking tests #127909
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # muted-tests.yml
# Conflicts: # muted-tests.yml
ivancea
added
>test
Collaborator
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
ivancea
commented
May 8, 2025
| private boolean shouldRandomizeBlocks() { | ||
| return Arrays.stream(Thread.currentThread().getStackTrace()) | ||
| .noneMatch( | ||
| e -> e.getClassName().equals(OperatorTestCase.class.getName()) && e.getMethodName().equals("testSimpleCircuitBreaking") |
Contributor
Author
There was a problem hiding this comment.
I wish we had C#'s nameof() to make this more robust. But I think adding that link in the javadoc is the only simple option we have (?)
nik9000
reviewed
May 8, 2025
Member
nik9000
left a comment
nik9000
left a comment
There was a problem hiding this comment.
I'd really prefer to do this with a function parameter. It's an extra parameter in a zillion places, but it feels more honest.
ivancea
commented
May 9, 2025
Comment on lines
+40
to
+42
| protected record SimpleOptions(boolean requiresDeterministicFactory) { | ||
| public static final SimpleOptions DEFAULT = new SimpleOptions(false); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
Created this structure instead of just a boolean as it's:
- Easier to understand from callers
- Extendable (Not a big concern now, but the first point makes more sense to me)
ivancea
commented
May 9, 2025
| /** | ||
| * Calls {@link #simple(SimpleOptions)} with the default options. | ||
| */ | ||
| protected final Operator.OperatorFactory simple() { |
Contributor
Author
There was a problem hiding this comment.
Added those methods to keep changes at a minimum
ivancea
commented
May 9, 2025
| public final void testSimpleCircuitBreaking() { | ||
| ByteSizeValue memoryLimitForSimple = enoughMemoryForSimple(); | ||
| Operator.OperatorFactory simple = simple(); | ||
| Operator.OperatorFactory simple = simple(new SimpleOptions(true)); |
Contributor
Author
There was a problem hiding this comment.
And this is the method actually using the new param
nik9000
approved these changes
May 9, 2025
Comment on lines
+40
to
+42
| protected record SimpleOptions(boolean requiresDeterministicFactory) { | ||
| public static final SimpleOptions DEFAULT = new SimpleOptions(false); | ||
| } |
jfreden
pushed a commit
to jfreden/elasticsearch
that referenced
this pull request
May 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #127833
A Block type randomization was added here (32588b5) to test different code paths based on the specific agg groupIds block type.
Now, a circuit breaking test fails sometimes, as it expects memory usage to be exact and deterministic, and the randomization may choose a more or less optimum path, changing the memory usage.